Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build with specific option combination. #1918

Merged
merged 1 commit into from
May 15, 2024
Merged

Fix build with specific option combination. #1918

merged 1 commit into from
May 15, 2024

Conversation

fernape
Copy link
Contributor

@fernape fernape commented May 15, 2024

With at least double buffer, mouse events, lua imlib2, xinerama and wayland support disabled, the #ifdef combination in the code fails to build:

[snip]

/wrkdirs/usr/ports/sysutils/conky-awesome/work/conky-1.21.0/src/llua.h:62:6: error: variable has incomplete type 'void' void llua_setup_window_table(conky::rect<int> text_rect);
     ^
/wrkdirs/usr/ports/sysutils/conky-awesome/work/conky-1.21.0/src/llua.h:62:37: error: no member named 'rect' in namespace 'conky' void llua_setup_window_table(conky::rect<int> text_rect);
                             ~~~~~~~^
[snip]

/wrkdirs/usr/ports/sysutils/conky-awesome/work/conky-1.21.0/src/x11-settings.cc:80:52: error: no member named 'width' in 'conky_x11_window'
      XCreatePixmap(display, window.window, window.width + 1, window.height + 1,
                                            ~~~~~~ ^
/wrkdirs/usr/ports/sysutils/conky-awesome/work/conky-1.21.0/src/x11-settings.cc:80:70: error: no member named 'height' in 'conky_x11_window'
      XCreatePixmap(display, window.window, window.width + 1, window.height + 1,
                                                              ~~~~~~ ^

This commit fixes the usage of the geometry field in conky_x11_window.

Checklist

  • I have described the changes
  • I have linked to any relevant GitHub issues, if applicable
  • Documentation in doc/ has been updated
  • All new code is licensed under GPLv3

Description

  • Describe the changes, why they were necessary, etc
  • Describe how the changes will affect existing behaviour.
  • Describe how you tested and validated your changes.
  • Include any relevant screenshots/evidence demonstrating that the changes work and have been tested.

@fernape
Fix build with specific option combination.
dcc6cba 
With at least double buffer, mouse events, lua imlib2, xinerama and wayland
support disabled, the #ifdef combination in the code fails to build:

[snip]

/wrkdirs/usr/ports/sysutils/conky-awesome/work/conky-1.21.0/src/llua.h:62:6: error: variable has incomplete type 'void'
void llua_setup_window_table(conky::rect<int> text_rect);
     ^
/wrkdirs/usr/ports/sysutils/conky-awesome/work/conky-1.21.0/src/llua.h:62:37: error: no member named 'rect' in namespace 'conky'
void llua_setup_window_table(conky::rect<int> text_rect);
                             ~~~~~~~^
[snip]

/wrkdirs/usr/ports/sysutils/conky-awesome/work/conky-1.21.0/src/x11-settings.cc:80:52: error: no member named 'width' in 'conky_x11_window'
      XCreatePixmap(display, window.window, window.width + 1, window.height + 1,
                                            ~~~~~~ ^
/wrkdirs/usr/ports/sysutils/conky-awesome/work/conky-1.21.0/src/x11-settings.cc:80:70: error: no member named 'height' in 'conky_x11_window'
      XCreatePixmap(display, window.window, window.width + 1, window.height + 1,
                                                              ~~~~~~ ^
This commit fixes the usage of the "geometry" field in conky_x11_window.
@github-actions github-actions bot added sources PR modifies project sources display: x11 Issue related to X11 backend lua Issue or PR related to Lua code labels May 15, 2024
@netlify Netlify
Copy link

netlify bot commented May 15, 2024 •
edited
Loading

✅ Deploy Preview for conkyweb canceled.

Name Link
🔨 Latest commit dcc6cba
🔍 Latest deploy log https://app.netlify.com/sites/conkyweb/deploys/6644f09e6faef80008404d94

Caellian
Caellian approved these changes May 15, 2024
View reviewed changes
Copy link
Collaborator

@Caellian Caellian left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good fixes for code that was left behind after #1910.

@Caellian Caellian merged commit c635df8 into brndnmtthws:main May 15, 2024
62 of 63 checks passed
@brndnmtthws brndnmtthws added the bug Bug report or bug fix PR label May 16, 2024
@fernape fernape mentioned this pull request May 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Caellian Caellian Caellian approved these changes

Assignees
No one assigned
Labels
bug Bug report or bug fix PR display: x11 Issue related to X11 backend lua Issue or PR related to Lua code sources PR modifies project sources
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fernape @Caellian @brndnmtthws